From 35ac74a03702f1e2e372f2a00639d0301be6cc41 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Fri, 29 Dec 2006 19:11:32 +0000 Subject: [PATCH] return if the widget that originally received the event is a notebook 2006-12-29 Carlos Garnacho * gtk/gtknotebook.c (gtk_notebook_scroll): return if the widget that originally received the event is a notebook page. (#315440, reported by Mateusz Stefek) --- ChangeLog | 6 ++++++ gtk/gtknotebook.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b11d82f691..a2bfd3b0ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-12-29 Carlos Garnacho + + * gtk/gtknotebook.c (gtk_notebook_scroll): return if the widget that + originally received the event is a notebook page. (#315440, reported + by Mateusz Stefek) + 2006-12-29 Matthias Clasen * gdk/gdkcolor.c (gdk_color_hash): Fix a typo. (#390613, diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index 23abb59217..9f8d14ed00 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -2301,7 +2301,7 @@ gtk_notebook_scroll (GtkWidget *widget, originator = gtk_get_event_widget ((GdkEvent *)event); /* ignore scroll events from the content of the page */ - if (!originator || gtk_widget_is_ancestor (originator, child)) + if (!originator || gtk_widget_is_ancestor (originator, child) || originator == child) return FALSE; switch (event->direction) -- 2.30.2